From 48ca6621a18f62ec843322809bb080f5df6a1ddb Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 9 Aug 2024 17:22:35 +0200
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 551893 -> 552612 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index d9ce2736834..fdf4ea863c3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -926,7 +926,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 9d2d52da3a45047ac69f1217f26100cc53d9c64a..830d788e66dec2349b18f473831312817c3d09f6 100644
GIT binary patch
delta 602
zcmZWmO=uHA6lRi_?2lO`wQQ3Z&7??0X%B4<o^nX6NaG;~!Hd)yn{5*<37EJ+4<bV8
zNfDOzyA%oH#Ui1C8rUpSk)8zgP>~k=xp@$&9t*`f+iv~A2jB4Kd*8fo=FPkJ$p;^j
zH=nR<LsPkkbC(Kcp;#Ta22CAKf`vkja=kR*u~@spV$$wr(qu;{C-nGevM3&zOjW!Z
zFIq1)bU8nKn(qp-*qUZZjFec{?+)B#eTi+~(f<A&f7foz>yo}^)JA7g4JP0d@V8S9
zDrLh)rEqb|7^@a9_wr<#SE_jZl#b2b4a&GZFR54$`y*%$NgBS`q{oe^nxQJ?30^m9
zb>4gUZwvged=YC=Cq!*ZVe&EU#kXf-DcTf4Y=vo<zefu0*c6|8?jtPNl)&}2FOC~)
zOmz)n_^JkUd=C3n#5>f3r48C=HRBR89U8>yD?#O(0TrL%@5b8&wtwyxh0y9y8sC>i
zw%(zGmM!jmVVX3wmPp0{hX$;dsR$0OFd07|QV{1IIu7l=PsXf6(Ub0HxiL{z6~6OA
zg<q}Ij5^O{&Sr-5Cj>8wo@QI&=Kn~r=umfZ<jkp@&>vO*jL2)@Roo%<X#btmF|-`)
V!W+<@nN5cT0s_JIrX#JkegO~q(ii{$

delta 222
zcmZ2-SMlm~#fB}6PUY>7D;R;835c1uKdxYjbeev16^qLBcxE<^>Giu=yr$1-W8#?p
zXE%%S^xyMYB&K`s0TR1*un0}B+`}R>edZn(`RTXfm_(+_-(lpMes2$p)O76>7Ov?A
zFW3dAOYCJ4pZsAN-*nf#EQZr-cd~d+zrL5nU^@Rk7RBi{!5rMvz4rkn%yO6nrq9{O
zVmtleJ{HO87Qfi}mAxFp99{gKHMty}<AXz;f<rW*BA&tSUSJ8X=@$bzWZF;fX8~eX
NAZFWsdO!QkbpWh$RkHv9

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0095619d50..eeb4afa2a51 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 8b8ee8ccaac..073f048998f 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2